Repository navigation
Fix samples build on Apple Silicon; refresh Hugo modules; drop script headers - #85
Merged
Merged
Conversation
Spine Bootstrap 1.7.0 configures the samples build to resolve third-party artifacts (protoc, the gRPC codegen plugin) from JCenter, which is shut down, and pins protoc 3.13.0 / protoc-gen-grpc-java 1.28.1 — versions that predate Apple Silicon and have no `osx-aarch_64` build at any repository. As a result `:generateProto` fails on arm64 Macs, and the JCenter reference is dead weight everywhere else. Repoint third-party resolution to Maven Central (Spine's own artifacts keep resolving from the `spine.mycloudrepo.io` repositories Bootstrap also injects), and, on arm64 macOS only, force the `osx-x86_64` protoc and gRPC binaries so they run under Rosetta 2 while staying pinned at the exact Bootstrap-selected versions — generated code is byte-for-byte identical to every other platform. Non-mac platforms keep Bootstrap's auto-detected native binary, so the Linux CI job is unaffected. Verified with `./gradlew -p docs/_code/samples clean buildAll` (compileJava, compileTestJava, and test all pass) on an arm64 Mac. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
master renormalized gradlew.bat to CRLF via an updated `.gitattributes` (`text`, `eol=crlf`). Recording the identical content on this branch lets the master merge proceed; the blob is byte-for-byte identical to master's gradlew.bat, so it contributes no net change to the PR. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Resolve the sole conflict in docs/_code/samples/build.gradle: keep master's current copyright header (CodeMatters) and retain this branch's samples build fix (Maven Central repoint + arm64 osx-x86_64 protoc/grpc override). The build logic is byte-for-byte identical to the already-verified fix commit; only the comment header changed. gradlew.bat matches master's line-ending normalization. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
alexander-yevsyukov
changed the title
docs/_code/samples build on Apple Silicon
... to be in-line with scripts in `config` and other repos.
alexander-yevsyukov
changed the title
docs/_code/samples build on Apple Silicon
armiol
approved these changes
Oct 1, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This branch began as a fix for the
docs/_code/samplesbuild on Apple Siliconand now also carries two independent housekeeping changes, grouped in at the
maintainer's request: a refresh of the site's Go/Hugo modules and the removal of
copyright headers from the
docs/_script/*helpers.Net change vs
master:docs/_code/samples/build.gradledocs/go.mod,docs/go.sum,docs/_preview/go.mod,docs/_preview/go.sumdocs/_script/{check-samples,embed-code,hugo-build,hugo-serve,install-dependencies}1. Fix
docs/_code/samplesbuild on Apple Siliconspine.enableJava().server()(Spine Bootstrap 1.7.0, from 2020) drives thesamples build's repository and codegen-tool configuration, and two things it
sets are now broken:
for third-party artifacts such as
protoc. Nothing resolves from it.protoc:3.13.0andprotoc-gen-grpc-java:1.28.1, which predate Apple Silicon — noosx-aarch_64build of either exists at any repository, so
:generateProtofails on arm64 Macs.Change —
docs/_code/samples/build.gradle, afterspine.enableJava().server():BintrayJCenterrepo and addmavenCentral(). Spine's ownartifacts keep resolving from the
spine.mycloudrepo.iorepositories Bootstrapalso injects — only the third-party source is repointed.
osx-x86_64protoc and gRPC binaries. Theyrun under Rosetta 2 and stay pinned at the exact Bootstrap-selected versions,
so generated code is identical to every other platform. Other platforms keep
the auto-detected native binary, so the Linux CI job is unaffected. The v1
Bootstrap/protoc line is preserved.
Verified with
./gradlew -p docs/_code/samples clean buildAll(compileJava,compileTestJava, and test all pass) on an arm64 Mac.
Reviewer notes
check-code-embedding.yml→build-embedded-code(./gradlew :buildAllonubuntu-latest/JDK 8). It isLinux-x86_64 only, which is why this only ever broke local arm64 Mac builds;
the change also moves samples off the sunset JCenter.
examples/hello, Bootstrap 1.9.0;examples/airport, Bootstrap 1.8.0) — both fail onprotoc-3.13.0-osx-aarch_64.Those are pinned
spine-examples/*submodules, so the equivalent fix belongsupstream and is not included here.
2. Refresh Go/Hugo modules
Bump the Hugo modules the site pulls in:
docs/—validation/docs→…20260902132507-6465029c83b9docs/_preview/—site-commons→…20260722151517-5ab10187ff58,validation/docs→…6465029c83b9,hugo-mod-bootstrap-scss/v5v5.20300.20400→v5.20300.20800Verified by rebuilding the preview site —
npm ci+hugo --gcindocs/_preview(i.e../gradlew installDependencies buildSite): 95 pages, nowarnings or errors, and
hugo mod graphconfirms the new versions are the onesactually resolved.
3. Remove copyright headers from
docs/_script/*Strip the boilerplate license/copyright comment blocks from the five helper
scripts. Shebang lines and executable bits are retained, so Gradle's
Exectasks (
runSite,buildSite,embedCode,checkSamples,installDependencies) are unaffected.Note on the base merge
masterwas merged into this branch to clear GitHub's merge-conflict state. Theonly content conflict was the
build.gradlecopyright header, resolved inmaster's favour (the
CodeMattersheader);gradlew.batwas aligned withmaster's line-ending normalization and carries no net change.
🤖 Generated with Claude Code